merge
authorKeir Fraser <keir@xen.org>
Wed, 1 Jun 2011 15:42:39 +0000 (16:42 +0100)
committerKeir Fraser <keir@xen.org>
Wed, 1 Jun 2011 15:42:39 +0000 (16:42 +0100)
commitf769c6e64f1bbda45fbe7965d7adf60afd479a3d
tree419f7bfc292282b95e2bc90aba3fde370a8ed599
parentb39d3fa4288b0025ce9cf16e6a96174b8916b8a5
parentaf2302dbf58bbd84a04e7c689feb30e0adc0f1f1
merge